b412d0f13fa336db165c2722c9fe05091d5602c7,uportal-war/src/main/java/org/jasig/portal/security/provider/AuthorizationImpl.java,AuthorizationImpl,canPrincipalManage,#IAuthorizationPrincipal#number#,201

Before Change


     * may not yet be published or expired.
     */
    
    String all = IPermission.ALL_CHANNELS_TARGET;
    String activity = IPermission.CHANNEL_MANAGER_EXPIRED_ACTIVITY;
	if ((order <= ChannelLifecycleState.EXPIRED.getOrder() 
			|| channel.getExpirationDate() != null)
			&& (doesPrincipalHavePermission(principal, owner, activity, all)
				|| doesPrincipalHavePermission(principal, owner,
						activity, target))) {
		return true;
    } 
	
	activity = IPermission.CHANNEL_MANAGER_ACTIVITY;
	if ((order <= ChannelLifecycleState.PUBLISHED.getOrder() 
    		|| channel.getPublishDate() != null)
			&& (doesPrincipalHavePermission(principal, owner, activity, all)
				|| doesPrincipalHavePermission(principal, owner, 
						activity, target))) {
    	return true;
    } 
	
	activity = IPermission.CHANNEL_MANAGER_APPROVED_ACTIVITY;
	log.debug("order: " + order + ", approved order: " + ChannelLifecycleState.APPROVED.getOrder());
	if (order <= ChannelLifecycleState.APPROVED.getOrder()
			&& (doesPrincipalHavePermission(principal, owner, activity, all)
				|| doesPrincipalHavePermission(principal, owner,
						activity, target))) {
    	return true;
    } 
	
	activity = IPermission.CHANNEL_MANAGER_CREATED_ACTIVITY;
	if (order <= ChannelLifecycleState.CREATED.getOrder()
			&& (doesPrincipalHavePermission(principal, owner, activity, all)
				|| doesPrincipalHavePermission(principal, owner,
						activity, target))) {
    	return true;
    }
    	

After Change


	activity = IPermission.CHANNEL_MANAGER_APPROVED_ACTIVITY;
	log.debug("order: " + order + ", approved order: " + ChannelLifecycleState.APPROVED.getOrder());
	if (order <= ChannelLifecycleState.APPROVED.getOrder()
			&& doesPrincipalHavePermission(principal, owner, activity, target)) {
    	return true;
    } 
	
	activity = IPermission.CHANNEL_MANAGER_CREATED_ACTIVITY;
	if (order <= ChannelLifecycleState.CREATED.getOrder()
			&& doesPrincipalHavePermission(principal, owner, activity, target)) {
    	return true;
    }